Fix #2289, implement common search routine for config files #2290
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Adds a 'cfe_locate_implementation_file()' function that provides a
consistent means to find a file within the ${MISSION_DEFS} subdirectory.
Similar locate/search logic was necessary in a few places, for
generate_config_includefile as well as add_cfe_tables, but these were
not consistent in the paths or ordering used. Using this function
should make them consistent.
jphickey
added
the
CCB:Ready
|
Follow-on work (assuming this can get merged in next cycle) would be to fix up these other search loops to use the same function: Line 703 in 7af467e cFE/cmake/target/CMakeLists.txt Line 217 in 7af467e Line 187 in 7af467e The last one (for add_cfe_tables) will be fixed as part of what I'm working on for #2284 ... |
dzbaker
added
CCB:Approved
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Apr 13, 2023
*Combines:* cFE v7.0.0-rc4+dev268 sch_lab v2.5.0-rc4+dev53 to_lab v2.5.0-rc4+dev45 **Includes:** *cFE* - nasa/cFE#2254 - nasa/cFE#2288 - nasa/cFE#2290 *sch_lab* - nasa/sch_lab#136 *to_lab* - nasa/to_lab#139 Co-authored by: Joseph Hickey <[email protected]>
This was referenced Apr 13, 2023
dzbaker
added a commit
to nasa/cFS
that referenced
this pull request
Apr 13, 2023
*Combines:* cFE v7.0.0-rc4+dev268 sch_lab v2.5.0-rc4+dev53 to_lab v2.5.0-rc4+dev45 **Includes:** *cFE* - nasa/cFE#2254 - nasa/cFE#2288 - nasa/cFE#2290 *sch_lab* - nasa/sch_lab#136 *to_lab* - nasa/to_lab#139 Co-authored by: Joseph Hickey <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist (Please check before submitting)
Describe the contribution
Adds a 'cfe_locate_implementation_file()' function that provides a consistent means to find a file within the ${MISSION_DEFS} subdirectory.
Similar locate/search logic was necessary in a few places, for generate_config_includefile as well as add_cfe_tables, but these were not consistent in the paths or ordering used. Using this function should make them consistent.
Fixes #2289
Testing performed
Confirm that the new file matching routine finds the same file as the old logic did
Expected behavior changes
More flexibility with
generate_config_includefile()System(s) tested on
Debian
Additional context
Currently this PR only employs the new logic for
generate_config_includefile(). Separate PRs will switchadd_cfe_tables()and any other logic used to search for other files.Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.